Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:03:12 +0000 (18:03 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sun, 17 Jul 2011 01:03:12 +0000 (18:03 -0700)
commite0ef68091990f0c9aa13b2691fa69ad16a7cd0f1
tree3255f2ed246ac65a7aaaf948955778e8881d1d86
parentaa34e492e8542e9d90e40d76b86fcfd70c9fc8b9
parentd1e588794ea8cfbb4c06c3a35e330e84aa818ccc
Merge from trunk.